From: cl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk>
Date: Fri, 24 Sep 2004 17:46:01 +0000 (+0000)
Subject: bitkeeper revision 1.1159.92.1 (41545d59Fxft7m0sKTtY19hpC5vj4A)
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~17400^2~570^2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=386c90e00024af7338e82a75cd89ea7ca4ba286a;p=xen.git

bitkeeper revision 1.1159.92.1 (41545d59Fxft7m0sKTtY19hpC5vj4A)

Leave the TSC cpu feature bit set.
---

diff --git a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/cpu/common.c b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/cpu/common.c
index 07ced337a2..83b293dcd5 100644
--- a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/cpu/common.c
+++ b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/cpu/common.c
@@ -534,7 +534,7 @@ void __init cpu_init (void)
 	}
 	printk(KERN_INFO "Initializing CPU#%d\n", cpu);
 
-	if (cpu_has_vme || cpu_has_tsc || cpu_has_de)
+	if (cpu_has_vme || cpu_has_de)
 		clear_in_cr4(X86_CR4_VME|X86_CR4_PVI|X86_CR4_TSD|X86_CR4_DE);
 	if (tsc_disable && cpu_has_tsc) {
 		printk(KERN_NOTICE "Disabling TSC...\n");
diff --git a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/timers/Makefile b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/timers/Makefile
index 6f7931e6da..f85f7de156 100644
--- a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/timers/Makefile
+++ b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/timers/Makefile
@@ -5,7 +5,7 @@
 XENARCH	:= $(subst ",,$(CONFIG_XENARCH))
 
 obj-y :=	timer_tsc.o
-c-obj-y :=	timer.o common.o timer_none.o timer_pit.o
+c-obj-y :=	timer.o timer_none.o timer_pit.o
 
 c-link	:=
 
diff --git a/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/mach-xen/setup_arch_post.h b/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/mach-xen/setup_arch_post.h
index 68889ad832..86c3d7c2ad 100644
--- a/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/mach-xen/setup_arch_post.h
+++ b/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/mach-xen/setup_arch_post.h
@@ -27,7 +27,6 @@ void __init machine_specific_modify_cpu_capabilities(struct cpuinfo_x86 *c)
 	clear_bit(X86_FEATURE_VME, c->x86_capability);
 	clear_bit(X86_FEATURE_DE, c->x86_capability);
 	clear_bit(X86_FEATURE_PSE, c->x86_capability);
-	clear_bit(X86_FEATURE_TSC, c->x86_capability);
 	clear_bit(X86_FEATURE_PGE, c->x86_capability);
 	clear_bit(X86_FEATURE_MTRR, c->x86_capability);
 	clear_bit(X86_FEATURE_FXSR, c->x86_capability);